From d0f887ddb144a69a85371041d1ad3640ab379ee8 Mon Sep 17 00:00:00 2001 From: Lin Ma Date: Mon, 25 May 2009 10:01:04 +0800 Subject: [PATCH] Fix GtkTooltip destroy the custom widget Fixed 576091, Custom_widget does not get destroyed when the tooltip goes away. Add a release note for this fix. --- README.in | 8 ++++++++ gtk/gtktooltip.c | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/README.in b/README.in index 6d81355472..3e2d7da727 100644 --- a/README.in +++ b/README.in @@ -27,6 +27,14 @@ Installation See the file 'INSTALL' +Release notes for 2.18 +====================== + +* gtk_tooltip_set_custom now accept a NULL custom_widget to unset the + old custom_widget. Custom_widget does not get destroyed when the + tooltip goes away. + + Release notes for 2.16 ====================== diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c index af733b7a65..77e47772cd 100644 --- a/gtk/gtktooltip.c +++ b/gtk/gtktooltip.c @@ -182,6 +182,7 @@ gtk_tooltip_finalize (GObject *object) tooltip->browse_mode_timeout_id = 0; } + gtk_tooltip_set_custom (tooltip, NULL); gtk_tooltip_set_last_window (tooltip, NULL); if (tooltip->window) @@ -333,12 +334,15 @@ gtk_tooltip_set_icon_from_icon_name(GtkTooltip *tooltip, /** * gtk_tooltip_set_custom: * @tooltip: a #GtkTooltip - * @custom_widget: a #GtkWidget + * @custom_widget: a #GtkWidget, or %NULL to unset the old custom widget. * - * Replaces the widget packed into the tooltip with @custom_widget. + * Replaces the widget packed into the tooltip with + * @custom_widget. @custom_widget does not get destroyed when the tooltip goes + * away. * By default a box with a #GtkImage and #GtkLabel is embedded in * the tooltip, which can be configured using gtk_tooltip_set_markup() * and gtk_tooltip_set_icon(). + * * Since: 2.12 */ -- 2.30.2